Fix buglet in meeting.

Tue Mar 20 15:00:43 2001  Jonathan Blandford  <jrb@webwynk.net>

	* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
	Fix buglet in meeting.

diff --git a/ChangeLog b/ChangeLog
index 34c4bf396f8874b58646d57a64511684bac3980e..4173a1618d00a1373026d125b3ae9b0f84626c0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 20 15:00:43 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+       Fix buglet in meeting.
+
 2001-03-19  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkiconfactory.c: Make GtkIconSource an opaque datatype, and

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 34c4bf396f8874b58646d57a64511684bac3980e..4173a1618d00a1373026d125b3ae9b0f84626c0a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Mar 20 15:00:43 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+       Fix buglet in meeting.
+
 2001-03-19  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkiconfactory.c: Make GtkIconSource an opaque datatype, and

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 34c4bf396f8874b58646d57a64511684bac3980e..4173a1618d00a1373026d125b3ae9b0f84626c0a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Mar 20 15:00:43 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+       Fix buglet in meeting.
+
 2001-03-19  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkiconfactory.c: Make GtkIconSource an opaque datatype, and

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 34c4bf396f8874b58646d57a64511684bac3980e..4173a1618d00a1373026d125b3ae9b0f84626c0a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Mar 20 15:00:43 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+       Fix buglet in meeting.
+
 2001-03-19  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkiconfactory.c: Make GtkIconSource an opaque datatype, and

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 34c4bf396f8874b58646d57a64511684bac3980e..4173a1618d00a1373026d125b3ae9b0f84626c0a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Mar 20 15:00:43 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+       Fix buglet in meeting.
+
 2001-03-19  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkiconfactory.c: Make GtkIconSource an opaque datatype, and

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 34c4bf396f8874b58646d57a64511684bac3980e..4173a1618d00a1373026d125b3ae9b0f84626c0a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Mar 20 15:00:43 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+       Fix buglet in meeting.
+
 2001-03-19  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkiconfactory.c: Make GtkIconSource an opaque datatype, and

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 34c4bf396f8874b58646d57a64511684bac3980e..4173a1618d00a1373026d125b3ae9b0f84626c0a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Mar 20 15:00:43 2001  Jonathan Blandford  <jrb@webwynk.net>
+
+       * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
+       Fix buglet in meeting.
+
 2001-03-19  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkiconfactory.c: Make GtkIconSource an opaque datatype, and

diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index 1649021574cd8d820ea163d3e291abd08935952f..205b0644726a00670090afe46837ed762c252a3c 100644 (file)
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -236,7 +236,8 @@ gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
 
   if (height)
     *height = calc_height;
-
+  if (width && height)
+    g_print ("Checking width/height %d %d\n", *width, *height);
   if (cell_area)
     {
       if (x_offset)
@@ -267,12 +268,11 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer *cell,
   GtkShadowType shadow;
   GtkStateType state;
   
-  width = MIN (TOGGLE_WIDTH, cell_area->width - cell->xpad * 2);
-  height = MIN (TOGGLE_WIDTH, cell_area->height - cell->ypad * 2);
-
   gtk_cell_renderer_toggle_get_size (cell, widget, cell_area,
                                     &x_offset, &y_offset,
                                     &width, &height);
+  width -= cell->xpad*2;
+  height -= cell->ypad*2;
 
   if (width <= 0 || height <= 0)
     return;